major update following feedback from Jan 24th