changed hard coded values