Major changes, #1
Minor changes, #2