optimization for full sail + reverting back to charlies original design