Review, Fix Time bug, change slicing