v0.64 - minor improvements
minor modification