Some resolve (4/30)

Some resolve