final Rodrigo tweaks