Issue#9

A optimiser