Changed the hardcoded values to constants values