merge in jareaus changes from this morning