Added more skeleton for part 2