Grabbed Dom's changes