updatee TODO: Bug in redoing straighten way