updated for final tweaks