Added conditions to showAll()