More modifications towards completing campaign