Hernan.improvements