added EOTD and stuff