Frame output refactoring complete