added checks
added checks