minor changes to throw people for a loop