updated for drag + images