EPS design updates finished (almost)