bring back in a huge optimization