#2: More small changes