I'm not totally clear how this class is used, but this should probably be final