adding context + moving to snippets