Fixed Stack logic and more