Yes, that's what I am mainly trying to replace, as the performance is just not there for my needs.