added more buggy changes