Output buffering added