some fixes and changes - Stack added-3