fixing 24hours bug again
fixing 24hours bug again
revert 24 hour bug/notfxed still
merge