Minor change - Buffer size minimized