This commit is my changes submitted Jan 21