Ok this is better. And will work for longturm. I will have to add a switch if we need more then one class.