Major rewrite: less repetition Dec 2