More changes to date mechanism