changes based on comments from scott