Updates by Haley & Aldrich