Some resolve (16/30)

Some resolve