Better inline handling