Vanilla time

merged in the vanilla code for the support site