Auobuffering added