Some resolve (12/30)

Some resolve