grabbing dan's updates