[101] improve by storing stack information