minus couple of todos