Added further methods
Resolved conflict