added new state machine to fix some issues with loading indicators ... #3