ICP1 wpo: finish macro stuff