part 2 added, not working