adding methods
Merge
Changing output of some of the convenience functions