Added ability to use both remotes