changes from garret