Adding more snippets and modifying some variable names