chanches in both class files