finish part 2, not sure if works yet though