Beta 1.1 final update