Green after refactoring to account for frames