Drastic changes made