updated to pass validation