now totally working prepared for new master status