tuple changes and removing a macros