Pre-final version
images added
Some improvements