Removed double-buffering for simple buffering