Change to buffered reader writer