Pstoica/setup