Removed hardcoded numbers from row saving