Update 

Removing Buffer