added expanded which functionality
updated for consistency
test this out please