Fix Chris's bug and added validation checking for two methods