Fix time vs datetime issue. Fully working now