Merged all edits from kelvin branches into separate branch