some small adaptations of the master