Gert's updates for production