Overtaking work - some improvement