Took out some magic numbers