Made HARemote*
Resolve merge conflict