upgrade to use moped gem