Made pushing to the frame easier
Removed duplicate code, further refactoring