Improved level change state