Some modifiactions..