Issues have been resolved (6/29)

Issues have been resolved