Initial modifications to prep for project integration