cleaned up master into frus