More bidir optimisations