2 errors eliminated @vjovanov