added isset conditional