More tweaking on custom metric form