Added the body to makeDevice