Refactor to gpm