Changes made 5/27 and 5/28