submitted changes as suggested in Fri meetup