added the guarding that I was conflicting