(Note to self: check this file more carefully, because this changes logic)