Some resolve (18/30)

Some resolve