change path, remove mount function and add comments