added support for part 2