More stable and more efficient (yay)