quick comment update
Reorganize this to avoid a forward (may reorganize the entire thing)