improved version of master server