Update #4
Update #5

removed unneccsery details from screen