Remade branch
Small stuff