My initial changes to forked code