fix and get broken part 1