improved separted files