clarify this needs to be done
add some more things