last fixes and states