updates with @cmgustavo comments