updated to recent master class