extended utility mini-library altered some state switching events logic