Update and adapt to stack