Fix perfomance issue, image update quite quick now