Actual state, with many improvements