Reoder Gotem and fix the mark them done