Updated validate & equals methods based on teacher recommendations