changed macro + using handling