Add remain conditions.
Fixes for new format of content.