removed optimization from last commit