Two adoptions from @Angel_Dragon