Commented the Dolphin script and also added some new functionality to it
Fixed merge conflict