removed hard-coded values