Loading.... more changes

98.8% completo