some subtle changes