Fixed HUUUUGE time problems