So the above macro's now work fine?