* Adding some stability improvements