For those interested in the original code...