second commit of andy