Initial reorganise + tank is done