final? tweaks