re-add basic macros for bs3