Episode 16 and 17 Added