skeleton updated with couple new macros