Big update, I don't remember everything I changed