Updated to new starting situation