added functions
removed newlines