Put The States Where They Belong