Some resolve (25/30)

Some resolve