Fix my reason for letting J-P do some actual work