added stacks. more tweaks for timing