Updated for compatability
Merge