Change msg.action, add other changes