A few more changes on Beta 1