Some additional changes

Signed-off-by: Gehadelrobey <gehadelrobey@gmail.com>