more duplicate classes fixed