ajusting functions names in main