added checks!