Add changes to places and add fix for state machine