add edge case and enhance RT robustness. TODO still: 'fix super size me'