Changes made per email from Eli