changed file structure, working on detailed calls