Moved states

Signed-off-by: Oxyyx <timcocu@gmail.com>