Improved Rabbit state  system