moved around things and hopefully locked things up correctly