Modify logic and markup