Eliminated hard coded parameters + shuffle optimizations