added some old macros (refactoring/cleanup needed)