changed macros to have rigid bodies