Commit with magic numbers

There are a couple of magic numbers inside this commit