improved snippets