updated macros...
revised update
we should use our own macros...
standardize sync object macros...