back in sync

revised code to sync old with new