Now hopefully without crashes.