Some esom's changes applied