#18 remote changes