Updated for larger frames