some drastic changes