added more stuff for remote
mergefix