Did some subtle changes