reverting to 21 Oct version