MANY more changes :D