changes as discussed with Greg