Changed image choose implementation