Made some overall changes