Updated utility functions
Merge problems