updated macro, config for faster uses