addressed stacks and enis' new comments