removed old comments. TO-DO: RENAME FUNCTIONS