Some chsnges