lots of improvements+latest initial state