changes to prepare for major coding