Inserting a better buffer management.