Added featured and improved stability