Temp commit
Merged Anssi's edits.