Revamped previous code.
Renamed code.