New version now that I've been using Python a bit longer.