add changes to try and get simpler version to run