SOme changes madafaca