syncronise with latest NetSpot changes