hagi4u : second commit