Updated to onDomReady
Merged