Optimization

fixes #84