Some smalll changes