Changes after EP1 through EP5

Nothing to say