changed set up so that we can easily add view all mode