Now without empty variables