Added a lot of different stuff