Some resolve (21/30)

Some resolve