few changes, needto find out about events