Updated to v0.2A