Updated logic statements using empty