after dan's review second commit