Use proper stopping of things