Removed hardcode