Add Double buffering