Adding initial I3 setup