Renamed and Updated Base, and fixed Field
Removing excess