added checks for other elements