Updated for fast image preview