Updated Format a Bit...