Upgraded to work with scrib 2.0.6