Time And Space rework

Time And Space rework