added all modifications based on this morning feedback session