added new functionality to master