Probably broke the code, ...but also some events and UI updates