can I get some sanity checking on these changes?