Small massaging of the master function.