added functions/classes