Stable with minor fixes