Pushing Javier's nice tweaks