still trying to fix dates.. nothing seems to work