TODO updated
fixes to stay compatible with talking_frame