Macro updates from JH