Some resolve (9/30)

Some resolve