made all major changes