Some resolve (14/30)

Some resolve