added form macros