Changes made with Jeff