Improvements

This is actually slower.