Merging Dom's changes