Improved Beta 2.0