add feedback from Thomas on Mar 31