Renamed, added more Replacement Functions and Style