0.6.1

Optimalization