Updated with problem for stack