Making required changes

Signed-off-by: Michael Granados <michaelgranados@gmail.com>