RF bug (start delay) & refactoring.