Modified to show data from database