Missed some magic numbers