preparing for 1.18