new logic for status