trying fix class...

It has not work well yet.