changed list command to work better