still working @ logic