Merge flippy12's Additions