Simpler way to compute editing times + bullet proof editing