Gave nicer structure.