Changed some stuffs! I don't think anything is broken?