Fixed Sunil's wild inefficiencies