update from julycoding 20140911