Some resolve (23/30)

Some resolve