Some resolve (26/30)

Some resolve