Added a second method
Fixed the conflict with the origin