refactor almost all methods for tutorial mode…