Some adjustrments