finally partially working