updating with ben's changes