Yacovs Changes

Signed-off-by: UnbrandedTech <james.kenaley1@gmail.com>