Updated, using userName file now