Updated commit with logic of Google Code