implemented 7/30 issues