master: more fine tuning