update to latest version and re-do changes