some corrections, still does not work