Redoing stuff prt1
Fixing prt2