make it better
add all