extend relative path
remove unneccesary condition