Updated with fixed clock stuff