changes from Stack Hammer demo