changed to not use e2wm
merge