some admitteds removed
merge conflicts resolved