Changed function name
Added public methods