And update function interfaces to take images.