Ready for a new joi part 2