changed AddSupply and Window, added new Class AddEvent