Removing need to tag first and last components.