made class loading better