Changes to keep format style