Moved almost everything on stack