Final Changes - Requested by Yaslin and Pedro

Signed-off-by: Maikol Guzman <mikeguzman@gmail.com>