incorporated essence of Vince's fixes