removing ugly macro from inital call