update master to be compliant with wip