TODO comments added at possible break points