Fixing things
Adding a new option for listing