start of beta 2.1