moved states inside connector