Refactor to use fillups instead of fillup for consistency with trips