More updates

Please review my changes @SL-GuillermoJacquez