added more functionality

Signed-off-by: Omer Toledano <omertoledano1@gmail.com>