tightened up setup