updated to use the most recent version of moto