a few more macros added to skeleton