added Dom's stuff