Merge Jason's Additions