cleaner logic for new section