These section looks cleaner with the new code.