Setup update 2

WIP @ankr please see my 2nd commit.
Could you maybe help me here? :)