added macros to switch from: field