updated to working state
added event view