Changes for PADRINO