Renamed and added a few things