nineth part of fixes