more changes, custom snippets