Added unfinished part 2