Rework based on jwo comments