breaker logic and cleaned up spstswith