Updated to match 0.98b