#261 more setup work