Started to fix min-mode