added forms macro