Got rid of useless type conversion and added buffering