Minor modifications gettings ready to combine everything together