Updated to use macros.