final change from dwendle