Removed some unessecary calculations