Beta 2

Beta 2 fix