added more events... adjusted speed