New version

Sew class name
Fixes