fixed stuff with time
merge
merge