changes from jconnors