Few iprovments