Returning back to v0.5