General changes. Haha! No idea of what did I change