added new rectangle and macros