added more safe vars