Stable with some fixes