removed hard coded values