added fixes for part 2