further adaption to current master