updated empty checks