Updated for single images