some adjustions