Fixed bug with time. Version is workig but hard to read