Code updates to v0.9-3