made some starting changes to fix the new issue