Events programming

Changes