ignore
Remove stop func ++
Add missing optionals