add macro. almost working again