updated to latest v1.63, WIP