can modify picture and fix intent ouf of memory problem
merge