macros and attenuation curves added