Added first checking