checking in... see diffs