partial classes fixed