changed some functions names and create new ones to divide even more the funcionality