resync of working code to master