Working copy

Changes for AgMip sim simulations