added some stuff after pull