Feature/add function