Added i3. Also cleanup.