New code as prepared by author: