changes from Chris