Deleted repeated functions, replaced OBJECT params with STRING params