Feature/keep events