changes to master so that it works well