Working version part 2, ready for Justitia