improve the shutdown, not the solid, reliable solution I want to do eventually