Improve perceived performance

Fixes #36