Proposed changes branch

merging jaycee's changes