The improved version, once again, thanks to Coeleste for doing this with me!.