Improved stability. Still a couple of issues left