Some major changes made