TA updated- functions splitted