updated ratio & macros