Tweak to include frame counter