Merging DiamondCardz's Changes