Version 1.0 - doesn't crash anymore.