removed func, changed naming conventions