Added conditions and _ variable