Hopefully the updated setup will mean no more random macro errors