Updated / Fixed Event Handler. Scoping issue.