Version 1.6 done.
Simplified a bit.