Added image selection step plus cleanup
thanks again