Updates to run in closure context; pass swfLocation as parameter