Commited #47 modifying.