issue #6 : now we store more information