Removed explicit dependense on spin_state