incorporated chagnes from andrew and jen