Removed hard coded numbers