[MOD] Complete mock of grace