Updated it with a lot of new things