now working on 2.0-beta3