Updated to match Beta version