Simplified the needs:x label checks