Some adjusments