Cloned from and updates with official release, with personal modifications.