add change to accept non-list