tweaks from jorge