Issues have been resolved (4/29)

Issues have been resolved