Removed hard coded values