Added more guards