Minor changes to controlEvent