Improved snippets