Got rid of hard-coded numbers