new version with separated files tasks