Test anna's function and it works
fixed merge