Fixing the setup and makehome method