tightening stuff up