Added i3 and more…