reorganized my markups