minor modifications to make changes work