Added time remap, active comp error checking