Updated for 2.0 beat2