Final Version That Works :-)

Signed-off-by: dgonca01 <dion_goncalves@yahoo.co.uk>