Merged Jade's Changes from history