fixes
working snapshot