is it ok to commit this? -rodri