updated for i3 removal