Rev'd to 0.5.2