removed hardcode