changes from timothy