Fixed function args issue, added function overloading