updates for compatibility with macros but still does not work due to renaming