Corrected Mistakes (Fingers Crossed)