tightened things up a bit