Changes to efficiency based on suggestions from flint++