again improved setup