Fix 6-3. Prepare to public