changes for handling remotes