Beta 1 from blog and wbb directory implementation