Macdate 03

Local changes