Latest updates

Signed-off-by: Alaa Attya Mohamed <vidooman@gmail.com>