episode numbers fixed for 16-17-18