fix events & start new feature