Added additional smarts to use logic