fixing bugs , updating PC handler
fixing bugs