EOD Updates

Joust corrections