Now with more functionality
Merge