refactored handling of 'incomplete'