0.6.1a

More optimalization