Operation tweaks pt 2