Added space handling and lowered the radius