update to 640 fork