Headers updated, merged code updated