cleaned up and made sure to use remotes