Added image buffering