and moving things into the appropriate block tags