fixed bug, systems and events mechanisms in place