hi all, would it be OK to commit this? -rodri