add change to accept non-list
add change to accept non-list