merged inf and val into core