I hope this thing is at least pretending to be more robust now