added calc
modified dira/file1