Minor modifications
conflict resolved