Changed !=null to !==null and removed hard-coded dates for now