Merge Changes from spoon