Simplified the logic in status