Fixed overlap and ordering, added paths