Major changes made