added ep36, edited ep24,25