updated from v0.3 to v0.5