Organized, added stuff for I3
organized better