Added epoch switch