Added Events, Updated Variables