changes commit for fresh start on the last changes made so far on Aug 8