Updated code

updated code to properly show needed info as can be shown