Modifying formatting/logic