monkeypatched comments. fix WIP