Changed the workings of several parts