Got rid of all hard coded numbers