I would go back to what worked for you. The bars seem not to be working out, I don't think.
It's about what our hair wants not about what we want for our hair, I always say. Meaning, you have to go by how your hair and scalp react to your products and if that's bad, then the solution is easy.
Welcome to the forum, BTW!
Bookmarks