Changed Magic numbers, please check