DRASTIC speed improvement! Fixes #48