merged chris' stuff (you can't lose anymore?)