The -i code doesn't really belong here in the first place I would think, but keep it together for now.