Made major changes