Changed 1 and 2 to old and new and also the format.