added Ep17 and prep for Ep18