sync changes from Cyndi