time change
Added daxda's fixes