Upgraded for v1.3.0