some changes for Wade to get started