Updated so that all info is dispalyed in reuslkts and nicely