No longer crashes on simulator. Performance / bug fixes