Version 1.1 2020.10.20
some edits