reworked pre formatting