Fixing the skeleton for part 1