Made updates to sucessfully validate