upgraded to 1.5
implemented -> macro