now with less crashing