Made some changes to adapt to a new print format