Updated to work with 2.1b1