change to final frame handling