approve function works
merge conflicts