beatifully executed
add avi and fix conflict