fixed up according to meeting on March 25th