Refixed bug. Added display code