Removed hardcoded lines