trying to make branch better than old method