Frame refactoring, part 3.