tightening up setup