Updated with Armando changes