updated, afraid of more crashingness