before large class change
problem almost fixed
problem almost fixed
fixed redirect error