Some resolve (5/30)

Some resolve