Bug Fix! Finished HW