small changes work in progress