[#715] Adds more logic to the  helper