some modifications
merege remote