value macros improved