ClosureEvents update by Crigges