syncing michael' updates