Renamed to a more apropriate filename / Added functions