Adjusted logic for status