now with time added
merge fix