Change some previous codes