Various changes as discussed.
Show attached files.