latest changes simplifications